fixed some performance issues
fixed some performance issues
fixed some performance issues