#5 Better factor and onset function now