Update
merged
Update
Removing callback guard