more changes from the last commit