removed while loops in Manager