drawing a 'square'
merge with upstream