Updating methods, and adding better code