commented out some non-essentials for now