reverted to old gui handling