A better way is on the way...