Changes for good working settings