removed old directive
added new directive, works better