Making the clone conditional even simpler