changes made to 3a
merge done