adding directives and better place selection