Menu logic changed for KMD's sake