remove returns, add callback on security