changed a couple more