Colton's mods to Charlie's Site