Changed stop to 50
A few changes
fixed merge