Redo Jakub's changes