Comyar's site upgrade