More redesigns
merge corrections