Don't hardcode as much