Added the FAW and style tweaks