changed to one loop and final fill