WIP: different update scenarios catered for