added first 2 callbacks