Adding new code. This can be considers to be V1