included mike's modifications