Fixed the beginning and follow the comments