Changed interface; Cosmetics