Updated code base with Philip Asare's example code