Took out hardcoded data