Changes for Functional bugs issues