Probably, but I was trying to change things as little as possible from the original code.