Made update available, cleaned up callback code