31

Some design improvements