replaced Path/Shape with Rectangle and Circle