with menu and new functinality