changes on package and add topCircle