* commited first working version