some optimization
i don't remember what these changes will do..!!
don't remeber these changes