Reverted to backup temporarily
Minor changes