Changed code to work for our specs.