Cleaned up pins scaffold v2