Updated interface; plus some merges: