More changes to the general design