Changed to be more R like