1. - FIX BUG
2. - Add dependency on change logic.