Removed previous changes as they do not work with napf