added tyler's change