Fixing a bit of a bug and addin something for FWY.