updated to use source wrapper