Updated to "David's logic"