Updated off of lab computer