changes to make forking work - i hope