working on my codes