Full commit. Attempt number 3