minor edits; removed Placemakr