Some changes to speed up lab