Reverted to Working Version before merge issue