made some changes for interface dev