Modify DrawSites. And Test Non-square area