TODO updated
Small performance improvement