More stable version commited