Do not duplicate controller
CS
This is not an atomic commit ;)