Try to do a slight re-design