implementation improves - still perfomace issues and strange results