made abunch of changes with juan