Improve C32 labs