Merge Changes from adriansonline from the source