Incorporated Siggi's suggestions