New design implementation by geekz