rearranging calling order for better cohesiveness
rearranging calling order for better cohesiveness

patbeagan1/libbeagan,patbeagan1/libbeagan,patbeagan1/libbeagan,patbeagan1/libbeagan,patbeagan1/libbeagan