Changing magic numbers will make this consistent!