A few design changes