Implementing suggestions by Isaac from Santosh Charity