Update in a bit of a nicer way