new design & preview function
changes 2