changed from 25 to 20 loop