updated to new styled version following the big diagram