Modified to suit new req's.