Implemented the changes I suggested in fb