Restoring KW changes and adding FN's time() and 'w' changes