added a menu option still buggy