more changes - working sorta