Merged Maheswari and Silvio code
Try to merge maheswari and silvios code