FS components changed to reduce calls