More improvements to SETUP