more best in place changes