resetting master to original state and moving changes to the processing2 branch