more seth changes
merged changes