Mostly adding function mapping to rename me (i know, i know, i should actually rename it)