added oval and rectangle