Lab 1.1 improvements