final changes for first working version