performance is massively improved
removed some debug msg