commented out some test lines