made functions consistant