backed out last change, did it in a better way.