edited scaffold for User