minor update, to be overridden fully later