Paths for states
Merge fix