merge with Bogdan's changes