prior to forking for features