Further changes to design