changed main little bit