adding round robin logic
merge complete