Removed fw and pt checks for now until integration is more robust