- applied Andrew changes