Updating to current code from AndrewNeo/faextender