Updated working commit