Edited for Hunter and MenuBar changes