just re-arranging methods