Several changes has been uploaded, including function edit