Lab 1.3 improvements