updating the fork with my answers