Uploaded final changes