Made changes, solved the challenge