Updating for our needs