Another design tweak