interface changes

14-feb -6
10:50:p:m
merge dilanka to master