hopefully fixed performance issues