diff --git a/.classpath b/.classpath
new file mode 100644
index 0000000..62bdf20
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" path="atm/src"/>
+	<classpathentry kind="output" path="atm/build/classes"/>
+</classpath>
diff --git a/.project b/.project
new file mode 100644
index 0000000..a9fd48a
--- /dev/null
+++ b/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ATM-Management-System-Maintenance-Project</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1768836522542</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/README.md b/README.md
index 7a5b30d..82c9795 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ This repository contains an ATM Management System project implemented in Java.
 
 ## Instructions
 
-To run the program, follow these steps:
+To run the program, follow these steps: --
 
-1. Run the `AtmMainDriver` file.
+1. Run the `AtmMainDriver` file. 
 2. No additional packages need to be downloaded.
 3. The username and password for both "Admin" and "User" are as follows:
    - Username: zahid
diff --git a/atm/bin/atm/AccountData.class b/atm/bin/atm/AccountData.class
new file mode 100644
index 0000000..ff995f1
Binary files /dev/null and b/atm/bin/atm/AccountData.class differ
diff --git a/atm/bin/atm/Admin.class b/atm/bin/atm/Admin.class
new file mode 100644
index 0000000..4b767b5
Binary files /dev/null and b/atm/bin/atm/Admin.class differ
diff --git a/atm/bin/atm/AfterLogin.class b/atm/bin/atm/AfterLogin.class
new file mode 100644
index 0000000..9e3b196
Binary files /dev/null and b/atm/bin/atm/AfterLogin.class differ
diff --git a/atm/bin/atm/AtmMainDriver.class b/atm/bin/atm/AtmMainDriver.class
new file mode 100644
index 0000000..d3bfa60
Binary files /dev/null and b/atm/bin/atm/AtmMainDriver.class differ
diff --git a/atm/bin/atm/LoginForm.class b/atm/bin/atm/LoginForm.class
new file mode 100644
index 0000000..917258e
Binary files /dev/null and b/atm/bin/atm/LoginForm.class differ
diff --git a/atm/bin/atm/TestTransactionHistory.class b/atm/bin/atm/TestTransactionHistory.class
new file mode 100644
index 0000000..9d61c2e
Binary files /dev/null and b/atm/bin/atm/TestTransactionHistory.class differ
diff --git a/atm/build/classes/atm/AccountData.class b/atm/build/classes/atm/AccountData.class
index 63e2f61..cf427aa 100644
Binary files a/atm/build/classes/atm/AccountData.class and b/atm/build/classes/atm/AccountData.class differ
diff --git a/atm/build/classes/atm/Admin.class b/atm/build/classes/atm/Admin.class
index 41f6dd1..0783623 100644
Binary files a/atm/build/classes/atm/Admin.class and b/atm/build/classes/atm/Admin.class differ
diff --git a/atm/build/classes/atm/AfterLogin.class b/atm/build/classes/atm/AfterLogin.class
index 42bdefe..1e3f39d 100644
Binary files a/atm/build/classes/atm/AfterLogin.class and b/atm/build/classes/atm/AfterLogin.class differ
diff --git a/atm/build/classes/atm/AtmMainDriver.class b/atm/build/classes/atm/AtmMainDriver.class
index 0357465..0da7eea 100644
Binary files a/atm/build/classes/atm/AtmMainDriver.class and b/atm/build/classes/atm/AtmMainDriver.class differ
diff --git a/atm/build/classes/atm/LoginForm$ATM_System.class b/atm/build/classes/atm/LoginForm$ATM_System.class
deleted file mode 100644
index 44cf94b..0000000
Binary files a/atm/build/classes/atm/LoginForm$ATM_System.class and /dev/null differ
diff --git a/atm/build/classes/atm/LoginForm.class b/atm/build/classes/atm/LoginForm.class
index c6d6812..d77e5f1 100644
Binary files a/atm/build/classes/atm/LoginForm.class and b/atm/build/classes/atm/LoginForm.class differ
diff --git a/atm/build/classes/atm/TestTransactionHistory.class b/atm/build/classes/atm/TestTransactionHistory.class
new file mode 100644
index 0000000..c029fa9
Binary files /dev/null and b/atm/build/classes/atm/TestTransactionHistory.class differ
diff --git a/atm/src/atm/Admin.java b/atm/src/atm/Admin.java
index 7e4e6a4..c22a146 100644
--- a/atm/src/atm/Admin.java
+++ b/atm/src/atm/Admin.java
@@ -2,9 +2,9 @@
 import java.awt.Color;
 import java.awt.Container;
 import java.awt.event.*;
+import java.io.*;
 import java.util.*;
 import javax.swing.*;
-import java.io.*;
 
 /*\ I have to add these options
     Add Account
@@ -23,7 +23,7 @@ public class Admin extends JFrame implements ActionListener
     JLabel atmLab;
     Container con;
     ArrayList customerlist;
-    String s1,s2,s3;
+    String s1;
     Admin()
     {
         super("ADMIN");
@@ -67,7 +67,42 @@ public class Admin extends JFrame implements ActionListener
     saveToFile.addActionListener(this);
     logOut.addActionListener(this);
     
+    loadPersons();
+    }
     
+    /*******************************LOAD ACCOUNT FROM FILE*******************************************/
+    public void loadPersons()
+    {
+        String ss[]=null;
+        String pincode,customername,accounttype,accountnumber,startbalance;
+        
+        try
+        {
+            FileReader fr=new FileReader("Customer Record.txt");
+            BufferedReader br=new BufferedReader(fr);
+            
+            String line=br.readLine();  
+            
+            while(line != null)
+            {
+                ss=line.split(",");
+                pincode=ss[0];
+                customername=ss[1];
+                accounttype=ss[2];
+                accountnumber=ss[3];
+                startbalance=ss[4];
+                
+                AccountData atm=new AccountData(pincode,customername,accounttype,accountnumber,startbalance);
+                customerlist.add(atm);
+                line=br.readLine();
+            }
+            br.close();
+            fr.close();
+        }
+        catch(IOException ioEX)
+        {
+            System.out.println("No existing customer records found. Starting fresh.");
+        }
     }
     
     /*******************************ADD ACCOUNT************************************************/
@@ -218,6 +253,7 @@ public void edit(String n)
     /************************************************************************************************************/
     
     /***************************************************************************************************/
+    @Override
     public void actionPerformed(ActionEvent e)
     {
 
diff --git a/atm/src/atm/AfterLogin.java b/atm/src/atm/AfterLogin.java
index fe8a76a..39732b9 100644
--- a/atm/src/atm/AfterLogin.java
+++ b/atm/src/atm/AfterLogin.java
@@ -1,290 +1,489 @@
-package atm;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
-import java.io.*;
- 
-public class AfterLogin extends JFrame implements ActionListener
-{
-    
-    JButton equiryBtn,withdrawBtn,logoutBtn,transferBtn;  
-    JLabel atmLab;
-    Container con;
-    ArrayList customerlist;
-    Admin adm = new Admin();
-    String s1;
-    
-    AfterLogin()
-    {
-        
-        super("Transaction");
-        customerlist=new ArrayList();
-        
-        con = this.getContentPane();
-        con.setLayout(null);
-        con.setBackground(Color.BLACK);
-       
-        
-        atmLab = new JLabel(new ImageIcon("atm.png"));
-        atmLab.setBounds(60,10,300,100);
-        
-        equiryBtn = new JButton("Balance Enquiry");
-        equiryBtn.setBounds(10,130,150,40);
-        
-        transferBtn = new JButton("Transfer Money");
-        transferBtn.setBounds(260,130,150,40);
-        
-        withdrawBtn = new JButton("WithDraw Money");
-        withdrawBtn.setBounds(260,230,150,40);
-        
-     
-        logoutBtn = new JButton("Logout");
-        logoutBtn.setBounds(10,230,150,40);
-               
-       con.add(atmLab);
-       con.add(equiryBtn);
-       con.add(withdrawBtn);
-       con.add(transferBtn);
-       con.add(logoutBtn);
-    /********************************************************************/
-    
-    equiryBtn.addActionListener(this);
-    transferBtn.addActionListener(this);
-    withdrawBtn.addActionListener(this);
-    logoutBtn.addActionListener(this);
-   
-    loadPersons();
-    }
-    /*****************************Load Data from File****************************************/ 
-   
-    	public void loadPersons()
-	{
-		String ss[]=null;
-		String pincode,customername,accounttype,accountnumber,startbalance;
-		
-		try
-		{
-			FileReader fr=new FileReader("Customer Record.txt");
-			BufferedReader br=new BufferedReader(fr);
-			
-
-			String line=br.readLine();	
-			
-			while(line != null)
-			{
-				ss=line.split(",");
-				pincode=ss[0];
-				customername=ss[1];
-				accounttype=ss[2];
-				accountnumber=ss[3];
-				startbalance=ss[4];
-
-				AccountData atm=new AccountData(pincode,customername,accounttype,accountnumber,startbalance);
-				customerlist.add(atm);
-				line=br.readLine();
-			}
-				br.close();
-				fr.close();
-		}
-		catch(IOException ioEX)
-		{
-			System.out.println(ioEX);
-		}
-	}
-
-/***************************************************************************************************************************/
-
-
-/********************************************************* Balance Enquiry of Customer ************************************/        
-	public void inquiry(String n)
-	{
-		for(int i=0;i<customerlist.size();i++)
-		{
-			AccountData atm=(AccountData)customerlist.get(i);
-			if(n.equals(atm.pincode))
-			{
-				JOptionPane.showMessageDialog(null,"Welcome to your atm data Mr  ."+atm.customername+"\nYour Total Cash Is : "+atm.startbalance,"WELCOME WELCOME MR  "+atm.customername,JOptionPane.INFORMATION_MESSAGE);
-			}
-		}
-	}
-/***************************************************************************************************************************/
-
-
-/****************************************************** Balance Transfer ***************************************************/
-	public void transfer(String k)
-	{
-		String a,b,c;
-		int d,e,f;
-
-
-		for(int i=0;i<customerlist.size();i++)
-		{
-			AccountData atm=(AccountData)customerlist.get(i);
-			if(k.equals(atm.pincode));
-			{
-				a=atm.startbalance;
-				d=Integer.parseInt(a);
-
-				c=JOptionPane.showInputDialog(null,"Enter The Account Number To whom you Transfer Amount","MONEY TRANSACTION MENU",JOptionPane.QUESTION_MESSAGE);
-				b=JOptionPane.showInputDialog(null,"Enter The Amount To Transfer","MONEYTRANSACTION MENU",JOptionPane.QUESTION_MESSAGE);
-				e=Integer.parseInt(b);
-
-				f=d-e;
-				while(f < 0)
-				{
-					a=atm.startbalance;
-					d=Integer.parseInt(a);
-
-					b=JOptionPane.showInputDialog(null,"Invalid Amount\nPlease Enter The Suffecient Amount To Transfer","MONEYTRANSACTION MENU",JOptionPane.WARNING_MESSAGE);
-					e=Integer.parseInt(b);
-					f=d-e;
-				}
-				String u=String.valueOf(f);
-				atm.startbalance=u;
-				
-				JOptionPane.showMessageDialog(null,"Transaction is done succesfully\n\nAmount of "+b+"is transferd To "+c+"\n\nYour Total Cash Is : "+atm.startbalance,"MONEY TRANSACTION PROCESSED",JOptionPane.INFORMATION_MESSAGE);
-				
-                                Admin as = new Admin();
-				as.savePerson();
-			}	
-		}
-	}
-
-/**********************************************************************************************************************************/
-
-
-/********************************************************* WithDraw Balance ******************************************************/        
-	public void withdraw(String o)
-	{
-		String a,b,c;
-		int d,e,f;
-
-		for(int i=0;i<customerlist.size();i++)
-		{
-			AccountData atm=(AccountData)customerlist.get(i);
-			if(o.equals(atm.pincode))
-			{
-				a=atm.startbalance;
-				d=Integer.parseInt(a);
-
-				b=JOptionPane.showInputDialog(null,"Enter The Amout To Withdarw","WITHDARW MENU",JOptionPane.QUESTION_MESSAGE);
-				e=Integer.parseInt(b);
-
-				f=d-e;
-
-				while(f <0)
-				{
-					a=atm.startbalance;
-					d=Integer.parseInt(a);
-
-					b=JOptionPane.showInputDialog(null,"Invalid Amount\nPlease Enter The Suffecient Amount To WithDraw","WITHDRAW MENU",JOptionPane.WARNING_MESSAGE);
-					e=Integer.parseInt(b);
-
-					f=d-e;
-				}
-				c=String.valueOf(f);
-				atm.startbalance=c;
-				JOptionPane.showMessageDialog(null,"Withdarw proccesed\nYou have Withdarwed Amount of"+b+"\nYour Total Cash Is now: "+atm.startbalance,"Information",JOptionPane.INFORMATION_MESSAGE);
-				Admin ad = new Admin();
-                                ad.savePerson();
-			}
-		}
-	}
-/********************************************************************************************************************************/
-
-
-
-/*************************************** ActionListener Code for Buttons ***********************************************************/
-    
-    public void actionPerformed(ActionEvent e)
-    {
-        JButton b = (JButton)e.getSource();
-        
-	if(b == equiryBtn)
-        {		
-            s1= JOptionPane.showInputDialog(null,"Enter PinCode To Check Account Balance ","Check Balance",JOptionPane.QUESTION_MESSAGE);
-            
-            
-            		for(int i=0;i<customerlist.size();i++)
-		{
-			AccountData atm=(AccountData)customerlist.get(i);
-
-			if(!s1.equals(atm.pincode))
-			{
-				JOptionPane.showMessageDialog(null,"You have entered Wrong Pincode \nPlease Enter Valid Pincode!!!!","Warning",JOptionPane.WARNING_MESSAGE);
-					
-			}
-                        else if(s1.equals(atm.pincode))
-			{
-			
-                            inquiry(s1);
-                        }            
-                }
-        }
-/******************************************************************************************************************************/
-        
-        if(b == withdrawBtn)
-        {
-          s1=JOptionPane.showInputDialog(null,"Enter PinCode To withDraw Balance ","Withdraw Balance",JOptionPane.QUESTION_MESSAGE);
-           for(int i=0;i<customerlist.size();i++)
-		{
-			AccountData atm=(AccountData)customerlist.get(i);
-
-                         if(s1.equals(atm.pincode))
-			{
-			
-                            withdraw(s1);
-                        }
-                         
-                         else if(!s1.equals(atm.pincode))
-			{
-				JOptionPane.showMessageDialog(null,"You have entered Wrong Pincode \nPlease Enter Valid Pincode!!!!","Warning",JOptionPane.WARNING_MESSAGE);
-					
-			}
-                }
-        }
-/******************************************************************************************************************************/
-
-        if(b == transferBtn)
-        {
-             s1=JOptionPane.showInputDialog(null,"Enter PinCode To Transfer Balance ","Share balance",JOptionPane.QUESTION_MESSAGE);
-           	
-             for(int i=0;i<customerlist.size();i++)
-		{
-			AccountData atm=(AccountData)customerlist.get(i);
-
-			if(!s1.equals(atm.pincode))
-			{
-				JOptionPane.showMessageDialog(null,"You have entered Wrong Pincode \nPlease Enter Valid Pincode!!!!","Warning",JOptionPane.WARNING_MESSAGE);
-					
-			}
-                        else if(s1.equals(atm.pincode))
-			{
-			
-                            transfer(s1);
-                        }            
-                }        
-        }
-        
-/******************************************************************************************************************************/
-        
-            if(b == logoutBtn)
-        {					
-	int n=JOptionPane.showConfirmDialog(null,"Are you sure you want to exit?","Exit",JOptionPane.YES_NO_OPTION);
-		if(n==JOptionPane.YES_OPTION)
-                {
-		JOptionPane.showMessageDialog(null,"Good Bye","ATM",JOptionPane.INFORMATION_MESSAGE);
-		System.exit(0);
-                }
-
-        }
-            
-   /******************************************************************************************************************************/                             
-    
-    
-    
-    
-    }  
-   
-}
+package atm;
+import java.awt.*;
+import java.awt.event.*;
+import java.io.*;
+import java.util.*;
+import javax.swing.*;
+ 
+public class AfterLogin extends JFrame implements ActionListener
+{
+    
+    JButton equiryBtn,withdrawBtn,logoutBtn,transferBtn,depositBtn,transactionHistoryButton;  
+    JLabel atmLab;
+    Container con;
+    ArrayList customerlist;
+    String s1;
+    String pincode;
+    
+    AfterLogin()
+    {
+        
+        super("Transaction");
+        customerlist=new ArrayList();
+        
+        con = this.getContentPane();
+        con.setLayout(null);
+        con.setBackground(Color.BLACK);
+       
+        
+        atmLab = new JLabel(new ImageIcon("atm.png"));
+        atmLab.setBounds(60,10,300,100);
+        
+        equiryBtn = new JButton("Balance Enquiry");
+        equiryBtn.setBounds(10,130,150,40);
+        
+        transferBtn = new JButton("Transfer Money");
+        transferBtn.setBounds(260,130,150,40);
+        
+        withdrawBtn = new JButton("WithDraw Money");
+        withdrawBtn.setBounds(260,230,150,40);
+        
+        depositBtn = new JButton("Deposit Money");
+        depositBtn.setBounds(135,180,150,40);
+        
+        transactionHistoryButton = new JButton("Transaction History");
+        transactionHistoryButton.setBounds(200,300,180,30);
+        transactionHistoryButton.setFont(new Font("Arial", Font.BOLD, 14));
+        
+        logoutBtn = new JButton("Logout");
+        logoutBtn.setBounds(10,230,150,40);
+               
+       con.add(atmLab);
+       con.add(equiryBtn);
+       con.add(withdrawBtn);
+       con.add(transferBtn);
+       con.add(depositBtn);
+       con.add(transactionHistoryButton);
+       con.add(logoutBtn);
+    /********************************************************************/
+    
+    equiryBtn.addActionListener(this);
+    transferBtn.addActionListener(this);
+    withdrawBtn.addActionListener(this);
+    depositBtn.addActionListener(this);
+    transactionHistoryButton.addActionListener(this);
+    logoutBtn.addActionListener(this);
+   
+    loadPersons();
+    }
+    /*****************************Load Data from File****************************************/ 
+   
+    	public void loadPersons()
+	{
+		String ss[]=null;
+		String pincode,customername,accounttype,accountnumber,startbalance;
+		
+		try
+		{
+			FileReader fr=new FileReader("Customer Record.txt");
+			BufferedReader br=new BufferedReader(fr);
+			
+
+			String line=br.readLine();	
+			
+			while(line != null)
+			{
+				ss=line.split(",");
+				pincode=ss[0];
+				customername=ss[1];
+				accounttype=ss[2];
+				accountnumber=ss[3];
+				startbalance=ss[4];
+
+				AccountData atm=new AccountData(pincode,customername,accounttype,accountnumber,startbalance);
+				customerlist.add(atm);
+				line=br.readLine();
+			}
+				br.close();
+				fr.close();
+		}
+		catch(IOException ioEX)
+		{
+			System.out.println(ioEX);
+		}
+	}
+
+/***************************************************************************************************************************/
+
+/********************************************************* Transaction Logging Method *************************************/
+private void logTransaction(String type, double amount, double newBalance) {
+    String filename = "transactions_" + this.pincode + ".txt";
+    try {
+        FileWriter fw = new FileWriter(filename, true);
+        BufferedWriter bw = new BufferedWriter(fw);
+        
+        // Get current timestamp
+        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String timestamp = sdf.format(new java.util.Date());
+        
+        // Write transaction details
+        bw.write(type + " | " + amount + " | " + newBalance + " | " + timestamp);
+        bw.newLine();
+        bw.close();
+        fw.close();
+    } catch(IOException ioEX) {
+        System.out.println(ioEX);
+    }
+}
+
+/***************************************************************************************************************************/
+
+/********************************************************* View Transaction History *************************************/
+public void viewTransactionHistory(String pincode) {
+    String filename = "transactions_" + pincode + ".txt";
+    try {
+        FileReader fr = new FileReader(filename);
+        BufferedReader br = new BufferedReader(fr);
+        
+        ArrayList<String> transactions = new ArrayList<>();
+        String line = br.readLine();
+        
+        while(line != null) {
+            transactions.add(line);
+            line = br.readLine();
+        }
+        br.close();
+        fr.close();
+        
+        // Display last 10 transactions
+        StringBuilder history = new StringBuilder();
+        int start = Math.max(0, transactions.size() - 10);
+        
+        if(transactions.isEmpty()) {
+            history.append("No transactions found.");
+        } else {
+            history.append("Last ").append(Math.min(10, transactions.size())).append(" Transactions:\n\n");
+            for(int i = start; i < transactions.size(); i++) {
+                history.append(transactions.get(i)).append("\n");
+            }
+        }
+        
+        JOptionPane.showMessageDialog(null, history.toString(), "Transaction History", JOptionPane.INFORMATION_MESSAGE);
+    } catch(IOException ioEX) {
+        JOptionPane.showMessageDialog(null, "No transaction history found for this account.", "Transaction History", JOptionPane.INFORMATION_MESSAGE);
+    }
+}
+
+/***************************************************************************************************************************/
+
+
+/********************************************************* Balance Enquiry of Customer ************************************/
+    private void inquiry(String k) {
+        for(int i=0;i<customerlist.size();i++) {
+            AccountData atm=(AccountData)customerlist.get(i);
+            if(k.equals(atm.pincode)) {
+                this.pincode = k;
+                JOptionPane.showMessageDialog(null,"Welcome to your atm data Mr  ."+atm.customername+"\nYour Total Cash Is : "+atm.startbalance,"WELCOME WELCOME MR  "+atm.customername,JOptionPane.INFORMATION_MESSAGE);
+            }
+        }
+    }        
+
+/***************************************************************************************************************************/
+
+
+/****************************************************** Balance Transfer ***************************************************/
+	public void transfer(String k)
+	{
+		String a,b,c;
+		int d,e,f;
+
+
+		for(int i=0;i<customerlist.size();i++)
+		{
+			AccountData atm=(AccountData)customerlist.get(i);
+			if(k.equals(atm.pincode));
+			{
+				a=atm.startbalance;
+				d=Integer.parseInt(a);
+
+				c=JOptionPane.showInputDialog(null,"Enter The Account Number To whom you Transfer Amount","MONEY TRANSACTION MENU",JOptionPane.QUESTION_MESSAGE);
+				//CR02- validation & error handling for balance transfer 
+        		try {
+            		b = JOptionPane.showInputDialog(null,"Enter The Amount To Transfer", "MONEY TRANSACTION MENU",JOptionPane.QUESTION_MESSAGE);
+          			e = Integer.parseInt(b);
+          			if (e <= 0) {
+            			throw new NumberFormatException();
+          			}
+        				} catch (NumberFormatException ex) {JOptionPane.showMessageDialog(null,"Invalid input. Please enter a valid numeric amount.","Input Error",JOptionPane.ERROR_MESSAGE);
+         				return;
+        			}
+        		f = d - e;
+				while(f < 0)
+				{
+					a=atm.startbalance;
+					d=Integer.parseInt(a);
+
+					b=JOptionPane.showInputDialog(null,"Invalid Amount\nPlease Enter The Suffecient Amount To Transfer","MONEYTRANSACTION MENU",JOptionPane.WARNING_MESSAGE);
+					e=Integer.parseInt(b);
+					f=d-e;
+				}
+				String u=String.valueOf(f);
+				atm.startbalance=u;
+				
+			logTransaction("Transfer", (double)e, (double)f);
+			
+				JOptionPane.showMessageDialog(null,"Transaction is done succesfully\n\nAmount of "+b+"is transferd To "+c+"\n\nYour Total Cash Is : "+atm.startbalance,"MONEY TRANSACTION PROCESSED",JOptionPane.INFORMATION_MESSAGE);
+				
+                                Admin as = new Admin();
+				as.savePerson();
+			}	
+		}
+	}
+
+/**********************************************************************************************************************************/
+
+
+/********************************************************* WithDraw Balance ******************************************************/        
+	public void withdraw(String o)
+	{
+		String a,b,c;
+		int d,e,f;
+
+		for(int i=0;i<customerlist.size();i++)
+		{
+			AccountData atm=(AccountData)customerlist.get(i);
+			if(o.equals(atm.pincode))
+			{
+				a=atm.startbalance;
+				d=Integer.parseInt(a);
+
+				//CR02-validation & error handling for withdraw  balance
+    			try {
+          		b = JOptionPane.showInputDialog(null,"Enter The Amount To Withdraw","WITHDRAW MENU",JOptionPane.QUESTION_MESSAGE);
+          		e = Integer.parseInt(b);
+          		if (e <= 0) {
+            		throw new NumberFormatException();
+          		}
+        			} catch (NumberFormatException ex) {JOptionPane.showMessageDialog(null,"Invalid input. Please enter a valid numeric amount.","Input Error",JOptionPane.ERROR_MESSAGE);
+        			return;
+     			}
+      			f = d - e;
+
+				while(f <0)
+				{
+					a=atm.startbalance;
+					d=Integer.parseInt(a);
+
+					b=JOptionPane.showInputDialog(null,"Invalid Amount\nPlease Enter The Suffecient Amount To WithDraw","WITHDRAW MENU",JOptionPane.WARNING_MESSAGE);
+					e=Integer.parseInt(b);
+
+					f=d-e;
+				}
+				c=String.valueOf(f);
+				atm.startbalance=c;			
+			logTransaction("Withdraw", (double)e, (double)f);
+							JOptionPane.showMessageDialog(null,"Withdarw proccesed\nYou have Withdarwed Amount of"+b+"\nYour Total Cash Is now: "+atm.startbalance,"Information",JOptionPane.INFORMATION_MESSAGE);
+				Admin ad = new Admin();
+                                ad.savePerson();
+			}
+		}
+	}
+/********************************************************************************************************************************/
+
+
+/********************************************************* Deposit Balance ******************************************************/        
+	public void deposit(String pincode)
+	{
+		String a,b,c;
+		int d,e,f;
+
+		for(int i=0;i<customerlist.size();i++)
+		{
+			AccountData atm=(AccountData)customerlist.get(i);
+			if(pincode.equals(atm.pincode))
+			{
+				a=atm.startbalance;
+				d=Integer.parseInt(a);
+
+				b=JOptionPane.showInputDialog(null,"Enter The Amount To Deposit","DEPOSIT MENU",JOptionPane.QUESTION_MESSAGE);
+				
+				// Input validation
+				if(b == null || b.isEmpty())
+				{
+					JOptionPane.showMessageDialog(null,"Deposit cancelled","Information",JOptionPane.INFORMATION_MESSAGE);
+					return;
+				}
+				
+				try
+				{
+					e=Integer.parseInt(b);
+					
+					// Validate positive amount
+					if(e <= 0)
+					{
+						JOptionPane.showMessageDialog(null,"Invalid Amount\nPlease Enter A Positive Amount To Deposit","DEPOSIT MENU",JOptionPane.WARNING_MESSAGE);
+						return;
+					}
+
+					f=d+e; // Add deposit amount to current balance
+					c=String.valueOf(f);
+					atm.startbalance=c;
+					
+					// Log transaction for deposit
+					this.pincode = pincode;
+					logTransaction("Deposit", (double)e, (double)f);
+					
+					JOptionPane.showMessageDialog(null,"Deposit Processed Successfully\n\nYou have Deposited Amount of "+b+"\nYour Total Cash Is now: "+atm.startbalance,"Information",JOptionPane.INFORMATION_MESSAGE);
+					
+					// Save to file
+					Admin ad = new Admin();
+					ad.savePerson();
+				}
+				catch(NumberFormatException nfe)
+				{
+					JOptionPane.showMessageDialog(null,"Invalid Input\nPlease Enter A Valid Number","ERROR",JOptionPane.ERROR_MESSAGE);
+				}
+			}
+		}
+	}
+/********************************************************************************************************************************/
+
+
+/*************************************** ActionListener Code for Buttons ***********************************************************/
+    
+    public void actionPerformed(ActionEvent e)
+    {
+        JButton b = (JButton)e.getSource();
+        
+	if(b == equiryBtn)
+        {		
+            s1= JOptionPane.showInputDialog(null,"Enter PinCode To Check Account Balance ","Check Balance",JOptionPane.QUESTION_MESSAGE);
+            this.pincode = s1;
+            
+            
+            		for(int i=0;i<customerlist.size();i++)
+		{
+			AccountData atm=(AccountData)customerlist.get(i);
+
+			if(!s1.equals(atm.pincode))
+			{
+				JOptionPane.showMessageDialog(null,"You have entered Wrong Pincode \nPlease Enter Valid Pincode!!!!","Warning",JOptionPane.WARNING_MESSAGE);
+					
+			}
+                        else if(s1.equals(atm.pincode))
+			{
+			
+                            inquiry(s1);
+                        }            
+                }
+        }
+/******************************************************************************************************************************/
+        
+        if(b == withdrawBtn)
+        {
+          s1=JOptionPane.showInputDialog(null,"Enter PinCode To withDraw Balance ","Withdraw Balance",JOptionPane.QUESTION_MESSAGE);
+          this.pincode = s1;
+           for(int i=0;i<customerlist.size();i++)
+		{
+			AccountData atm=(AccountData)customerlist.get(i);
+
+                         if(s1.equals(atm.pincode))
+			{
+			
+                            withdraw(s1);
+                        }
+                         
+                         else if(!s1.equals(atm.pincode))
+			{
+				JOptionPane.showMessageDialog(null,"You have entered Wrong Pincode \nPlease Enter Valid Pincode!!!!","Warning",JOptionPane.WARNING_MESSAGE);
+				
+			}
+                }
+        }
+/******************************************************************************************************************************/
+
+        if(b == transferBtn)
+        {
+             s1=JOptionPane.showInputDialog(null,"Enter PinCode To Transfer Balance ","Share balance",JOptionPane.QUESTION_MESSAGE);
+             this.pincode = s1;
+           	
+             for(int i=0;i<customerlist.size();i++)
+		{
+			AccountData atm=(AccountData)customerlist.get(i);
+
+			if(!s1.equals(atm.pincode))
+			{
+				JOptionPane.showMessageDialog(null,"You have entered Wrong Pincode \nPlease Enter Valid Pincode!!!!","Warning",JOptionPane.WARNING_MESSAGE);
+					
+			}
+                        else if(s1.equals(atm.pincode))
+			{
+			
+                            transfer(s1);
+                        }            
+                }        
+        }
+        
+/******************************************************************************************************************************/
+        
+        if(b == depositBtn)
+        {
+            s1=JOptionPane.showInputDialog(null,"Enter PinCode To Deposit Money","Deposit Balance",JOptionPane.QUESTION_MESSAGE);
+            this.pincode = s1;
+            
+            if(s1 == null || s1.isEmpty())
+            {
+                return; // User cancelled
+            }
+            
+            boolean found = false;
+            for(int i=0;i<customerlist.size();i++)
+            {
+                AccountData atm=(AccountData)customerlist.get(i);
+
+                if(s1.equals(atm.pincode))
+                {
+                    found = true;
+                    deposit(s1);
+                    break;
+                }
+            }
+            
+            if(!found)
+            {
+                JOptionPane.showMessageDialog(null,"You have entered Wrong Pincode \nPlease Enter Valid Pincode!!!!","Warning",JOptionPane.WARNING_MESSAGE);
+            }
+        }
+        
+/******************************************************************************************************************************/
+
+        if(b == transactionHistoryButton)
+        {
+            s1= JOptionPane.showInputDialog(null,"Enter PinCode To View Transaction History ","Transaction History",JOptionPane.QUESTION_MESSAGE);
+            
+            for(int i=0;i<customerlist.size();i++)
+            {
+                AccountData atm=(AccountData)customerlist.get(i);
+                
+                if(s1.equals(atm.pincode))
+                {
+                    viewTransactionHistory(s1);
+                }
+                else if(!s1.equals(atm.pincode))
+                {
+                    JOptionPane.showMessageDialog(null,"You have entered Wrong Pincode \nPlease Enter Valid Pincode!!!!","Warning",JOptionPane.WARNING_MESSAGE);
+                }
+            }
+        }
+        
+/******************************************************************************************************************************/
+        
+            if(b == logoutBtn)
+        {					
+	int n=JOptionPane.showConfirmDialog(null,"Are you sure you want to exit?","Exit",JOptionPane.YES_NO_OPTION);
+		if(n==JOptionPane.YES_OPTION)
+                {
+		JOptionPane.showMessageDialog(null,"Good Bye","ATM",JOptionPane.INFORMATION_MESSAGE);
+		System.exit(0);
+                }
+
+        }
+            
+   /******************************************************************************************************************************/                             
+    
+    
+    
+    
+    }  
+   
+}
diff --git a/atm/src/atm/AtmMainDriver.java b/atm/src/atm/AtmMainDriver.java
index 39da9ed..d09787b 100644
--- a/atm/src/atm/AtmMainDriver.java
+++ b/atm/src/atm/AtmMainDriver.java
@@ -1,7 +1,4 @@
 package atm;
-import java.awt.Color;
-import java.awt.event.*;
-import java.util.*;
 import javax.swing.*;
 
 public class AtmMainDriver 
@@ -17,3 +14,4 @@ public static void main(String[] args)
     }
     
 }
+
diff --git a/atm/src/atm/LoginForm.java b/atm/src/atm/LoginForm.java
index 997932a..6621872 100644
--- a/atm/src/atm/LoginForm.java
+++ b/atm/src/atm/LoginForm.java
@@ -1,13 +1,13 @@
 package atm;
 
+import java.awt.*;
 import java.awt.event.*;
-import javax.swing.*;
 import java.io.*;
-import java.awt.*;
+import javax.swing.*;
 
 public class LoginForm extends JFrame implements ActionListener
 {
-    
+    private static final long serialVersionUID = 1L;
 
     JPanel panel;
     JLabel lab1,lab2,picLab,userLab,adminLab;
@@ -107,8 +107,8 @@ public void actionPerformed(ActionEvent ae)
                 fr = new FileReader("loginInfo.txt");
                 br = new BufferedReader(fr);
 	
-                s1 = br.readLine();
-                s4 = br.readLine();     // for Password
+                s1 = br.readLine().trim();
+                s4 = br.readLine().trim();     // for Password
        
                 char [] p = Pfield.getPassword();
                  password = new String(p);                
@@ -128,7 +128,7 @@ else if( password.isEmpty())
              { 
                  JOptionPane.showMessageDialog(null,"ENTER YOUR Password"); 
              }
-                  else if(!Tfield.getText().equals(s1) && !password.equals(s4))
+                  else if(!Tfield.getText().equals(s1) || !password.equals(s4))
                         { 
                 JOptionPane.showMessageDialog(null,"WRONG USERNAME AND PASSWORD"); 
                         }
diff --git a/atm/src/atm/TestTransactionHistory.java b/atm/src/atm/TestTransactionHistory.java
new file mode 100644
index 0000000..f1593fb
--- /dev/null
+++ b/atm/src/atm/TestTransactionHistory.java
@@ -0,0 +1,44 @@
+package atm;
+
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class TestTransactionHistory {
+    public static void main(String[] args) {
+        String pin = "1234";
+        String filename = "transactions_" + pin + ".txt";
+        try {
+            BufferedWriter bw = new BufferedWriter(new FileWriter(filename, true));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            for (int i = 1; i <= 12; i++) {
+                String ts = sdf.format(new Date());
+                bw.write("Deposit | " + (100 + i) + " | " + (1000 + i) + " | " + ts);
+                bw.newLine();
+                try { Thread.sleep(30); } catch (InterruptedException ex) {}
+            }
+            bw.close();
+            System.out.println("Wrote 12 sample transactions to " + filename);
+        } catch (IOException e) {
+            System.out.println("Failed to write transactions: " + e);
+            e.printStackTrace();
+        }
+
+        try {
+            BufferedReader br = new BufferedReader(new FileReader(filename));
+            ArrayList<String> lines = new ArrayList<>();
+            String line;
+            while ((line = br.readLine()) != null) lines.add(line);
+            br.close();
+
+            int start = Math.max(0, lines.size() - 10);
+            System.out.println("\nLast " + Math.min(10, lines.size()) + " transactions:");
+            for (int i = start; i < lines.size(); i++) {
+                System.out.println(lines.get(i));
+            }
+        } catch (IOException e) {
+            System.out.println("Failed to read transactions: " + e);
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/atm/transactions_1234.txt b/atm/transactions_1234.txt
new file mode 100644
index 0000000..860dd06
--- /dev/null
+++ b/atm/transactions_1234.txt
@@ -0,0 +1,12 @@
+Deposit | 101 | 1001 | 2026-02-05 23:57:24
+Deposit | 102 | 1002 | 2026-02-05 23:57:24
+Deposit | 103 | 1003 | 2026-02-05 23:57:24
+Deposit | 104 | 1004 | 2026-02-05 23:57:24
+Deposit | 105 | 1005 | 2026-02-05 23:57:24
+Deposit | 106 | 1006 | 2026-02-05 23:57:24
+Deposit | 107 | 1007 | 2026-02-05 23:57:24
+Deposit | 108 | 1008 | 2026-02-05 23:57:24
+Deposit | 109 | 1009 | 2026-02-05 23:57:24
+Deposit | 110 | 1010 | 2026-02-05 23:57:24
+Deposit | 111 | 1011 | 2026-02-05 23:57:24
+Deposit | 112 | 1012 | 2026-02-05 23:57:24