Changes based on discussion with Slavek