changes from Marek