More attempts at improvements...