Made new design work on dev systems