Shrawan : 7 Aug 2014 : Refactored for Player