changes
need log for new return
Merge