B functionality is good and cleaned up some stuff on A functionality