Changes for improving efficiency