Integration

Current integrated changes
commented?