Edits to make this thing work