updated to first working version