Working
Working
Fixed merge problems