last commit with working forks. Forks will be deactivated for now to simplify the problem