added extension code
removed unecessary commented out code
added extension code