Updating overall functionality