After registering - this needs improvement