WIP Fixes bug vs performance problem