Adding, Modifying and Cleaned up Scaffold Pins