Feature/change int to ns