Several source changes made