the previous version imo was clearer