Added state return