fixed horrible performance & CPU usage issues @ server side