How to maintain correct