Updated version of lab8