updated code, still not working :-1: