Updated organization rotation logic