Re-enable some commented out parts