Short's set for her competition return