Responded to @timfernando's comments