Updates with menu. All should be working