Doug's modifications