Possible perfromance improvement