Add: retrieve function, modification on some comments