again changed definitios ;)