Adds Gdovicak's changes