repositioned some of the functions