Updated work from lab