Fixing interface almost done