reverting to previous methodology