Last small changes, then testing