validates again with new design. Incomplete though.