First update of working version