Minor changes to move interface.