should this be called in Command as well?