minor alterations/additions