Integration

Current integrated changes
why is this commented out?