Stefan's changes