Implemented rectangle boundary
Implemented circular mapping