changed names of functions to better reflect
functionallity and behaviour