Made some changes to make lab better
Merge pull request #411 from AZaitzeff/NC

Made some changes to make lab better