almost done......again.....