Added the #ifndef stuff