Changed some things around a bit to hopefully address the pain I've been having in my right hand.