Adding lots of changes