Updated hands-on