Version 2, added Rectange.