made better names for some functions