Task01: fixed issues with performance