Added Square and Rectangle Option