Better working commit