Updating Doc and ensuring no repetitive code