efficiency fixes