Keenon's changes