Update from changes of Kapeli