first commit working version