Switched to solution 3 for state parameter