Cleaned up fs, changed states