half way through adding changes
first full version