proposal is more or less working now