forked, trying to make Adding work correctly