changes applied attempt 3