Seem to be makings some progress...