Adding version 2 basic code