commented out some test statements