moving things around and updating stuff