Upgrade lab. Closes #398