All fixed and working version 1