some general modifications