minor edits, does not work yet