Modifications to previous patch

Signed-off-by: Bhadram <varkabhadram@gmail.com>

Conflicts:
	CHANGES