slight changes, now interface should be almost finished