seemingly working version commited