Two stocks making their way into the ASX 20 (and one on its way out)