modifications for 5.6