Twan's changes