Working version of revamped interface