New api, gui changes