moved method to correct place