computation added, tested ok