New design

Implementation of the new design