Design improvements v.2.1