cleaned up pins scaffold 2