Kieran - Update to have current WorkSpace