Trying to implement new design