Added code and sample