revised to fix silk conflicts, narrowed silk lines