Refractored based on Railsbp
Refractored based on Railsbp change2
Updated conflicts