messed up various functions by renaming core functions... - now renamed