Updated code to conform to SI recommenationds