changed order of after callbacks