removed new braces on old code to facilitate merge