small changes, not done yet
added paste to clean up