Changes to backprop
Fixed merge