modified tons of stuff again