----- Start modifications -----