added further scope and enhancement