Change to the smart way...