modifs suggested by Matthew