add circles
reindent
copy changes from server to local