bugFixed and working