Gpii 947

http://issues.gpii.net/browse/GPII-947
you may want to put the argument as a variable so that we can add break points and so that it reads easier.