Lab 2 improvements