michaljedryszka fork changes added