added circles
merged changes
incorporated new weight field from api