commited working version