Pass me?!  Changes made..