@jclaramunt has reviewed the implementations, and suggested few changes
@jclaramunt has reviewed the implementations, and suggested few changes