Logic reworked to work better with starcluster