//small re-design