Added some TODO comments for speed increase