Rewrite additions so it will pass if private functions disappear