Updated design & some modifications