Assignment 1 ver2

Used on-tap