New design & reworking functionalities