modified code but couln't commit for a while