Updated features after FE round 1