Implemented Alex first feedback