more changes applied