version 2.0 of lab2