Added menu mode