Rev.1

Final fixes before submitting the test