Update first commit: this code should work