The minor changes are done ^w^