Changed trim logic, still need to test bound logic