Few more changes to round robin, something is causing trouble...?