changed sub around