How to complete state return?