Adding in suggestions from Daeken, grey_wolf, and Yermo