Add some form of penalization of diagonal overflow as well