No need to supply noop anymore