performance issue fixed i think