comment out f13 modifications for now