working commit fixed