CHANGE - Allow quad to be empty