Fixing things. Take 1