Changed the lab significantly
Merge pull request #415 from AZaitzeff/optim

Changed the lab significantly