Added calback. Minor fixes