changes made, final test ready