On branch master (temp)

- normal computation done