Changes for better production