More changes to Svbtle duplication project