fixed  commented out stuff