design modified Oct 29th