fixing data bug - all working