refactor names
fix persistent bug
done