Slight customizations
FF