Changed methods order