Feature 2 update (scratch)