added new changes in sample branch