changes to interface module
fixed merge conflicts