Assignment 6 & update hands-on