got rid of the mayro class