attempted to remove all 5.4isms