Added some discount stuffs
Merged disc into develop