Jakub's changes