Removed diagnostic statements; this version should be good to go