1. commented out some stuff we don't need yet