taken care of cache
adding comments