Added more fixes for the circling.