Switched to Charles' clean code. 2.0 (Forgot index)