Started addong menu, optimized algo