reverting to old way