final changes, uploaded final version