workin on the code