some changes according to devgirl