i think its done and working