changed representation of some functions