Changes for improvements