A merged version of Alfayo's missing changes plus Antony's changes