Updates up to LAB 3.2
Uncommited changes