Corrected issue and added proper methods
Merge remote-tracking branch 'origin/T-Branch'
update