Took out Vegdahl's code