diff --git a/dequeue.cpp b/dequeue.cpp
index 1caebc1..e6aa490 100644
--- a/dequeue.cpp
+++ b/dequeue.cpp
@@ -21,268 +21,163 @@
 #include <iostream>
 using namespace std;
 
-// Defining the maximum size of the queue to be 10
-#define MAX 10
 
-void input_dequeue();
-void output_dequeue();
-
-
-/*
-
-Declaring a class called Dequeue having:
-
-  three private members:
-        dequeue[MAX]
-        left
-        right
-
-  three public member functions:
-
-        Constructor defining left to -1 and right to -1
-
-        insert right
-        insert left
-        delete right
-        delete left
-        display
-
-*/
-
-class Dequeue {
-  int dequeue[MAX], left, right;
-
-public:
-  Dequeue(): left(-1), right(-1) {}
-  void insert_right(int );
-  void insert_left(int );
-  void del_right();
-  void del_left();
-  void display();
+struct node {
+    int data;
+    struct node* link;
 };
 
-void Dequeue :: insert_right(int value) {
-  if((left == right + 1) || (left == 0 && right == MAX-1)) {
-    cout<<"The Queue is full !\n";
-    return;
-  }
-  if(left == -1) {
-    left = 0;
-    right = 0;
-  }
-  else {
-    if(right == MAX-1) {
-      right = 0;
-    }
-    else {
-      right++;
-    }
-  }
-  dequeue[right] = value;
-}
 
-void Dequeue :: insert_left(int value) {
-  if((left == right + 1) || (left == 0 && right == MAX-1)) {
-    cout<<"The queue is full !\n";
-    return;
-  }
-  if(left == -1) {
-    left = 0;
-    right = 0;
-  }
-  else {
-    if(left == 0) {
-      left = MAX-1;
+struct node* front, *rear;
+
+void insert_right(struct node* front1, struct node* rear1, int item){
+    struct node* newNode = new node;
+    if(newNode == NULL)
+        {
+            cout << "Overflow in memory";
+            return;
+        }
+    newNode->data = item;
+    newNode->link = NULL;
+
+    if(front == NULL && rear == NULL)
+        {
+            front = rear = newNode;
+        }
+    else
+    {
+        rear->link = newNode;
+        rear = newNode;
     }
-    else {
-      left--;
-    }
-  }
-  dequeue[left] = value;
+    
 }
 
-void Dequeue :: del_right() {
-  if(left == -1) {
-    cout<<"The queue is empty !\n";
-    return;
-  }
-
-  cout<<"The deleted value is: "<<dequeue[right]<<endl;
-
-  if(left == right) {
-    left = -1;
-    right = -1;
-  }
-  else {
-    if(right == 0) {
-      right = MAX-1;
+void delete_front(struct node* front1, struct node* rear1){
+    if(front == NULL)
+    {
+        cout << "Queue is already empty.";
+        return;
     }
-    else {
-      right--;
-    }
-  }
-}
 
-void Dequeue :: del_left() {
-  if(left == -1) {
-    cout<<"The queue is empty !\n";
-    return;
-  }
+    struct node* to_delete = front;
 
-  cout<<"The deleted value is: "<<dequeue[left]<<endl;
-
-  if(left == right) {
-    left = -1;
-    right = -1;
-  }
-  else {
-    if(left == MAX-1) {
-      left = 0;
+    if(front == rear){
+        front = rear =NULL;
     }
+
     else {
-      left++;
+        front = front->link;
+        to_delete->link = NULL;    
     }
-  }
 }
 
-void Dequeue :: display() {
-  int front = left;
-  int rear = right;
-
-  if(front == -1) {
-    cout<<"The queue is empty !\n";
-    return;
-  }
-  if(front <= rear) {
-    while(front <= rear) {
-      cout<<dequeue[front]<<" ";
-      front++;
+void insert_beg(struct node* front1, struct node* rear1, int item){
+    struct node* newNode = new node;
+    newNode->data = item;
+    newNode->link = NULL;
+    if(newNode == NULL)
+    {
+        cout << "Overflow in memory";
+        return;
+    } 
+
+    if(front == NULL && rear == NULL)
+        front = rear = newNode;
+    else{ 
+        newNode->link = front;
+        front = newNode;
     }
-  }
-  else {
-    while(front <= MAX-1) {
-      cout<<dequeue[front]<<" ";
-      front++;
-    }
-    front = 0;
-    while(front <= rear) {
-      cout<<dequeue[front]<<" ";
-      front++;
-    }
-  }
-  cout<<endl;
 }
 
-void input_dequeue() {
-  int option, value;
-  Dequeue dq;
-
-  do {
-    cout<<"\n****** MENU ******\n"
-        <<"1. Insert right\n"
-        <<"2. Delete right\n"
-        <<"3. Delete left\n"
-        <<"4. Display\n"
-        <<"5. Exit to Main Menu\n";
-
-    cout<<"Enter your option: ";
-    cin>>option;
-
-    switch(option) {
-      case 1: cout<<"Enter the value to be inserted: ";
-              cin>>value;
-
-              dq.insert_right(value);
-              break;
-
-      case 2: dq.del_right();
-              break;
-
-      case 3: dq.del_left();
-              break;
-
-      case 4: dq.display() ;
-              break;
-
-      case 5: break;
-
-      default: cout<<"Wrong option !\n";
-               break;
+void delete_rear(struct node* front1, struct node* rear1){
+    if(front == NULL && rear == NULL){
+        cout << "Underflow\n";
+        return;
     }
-  } while(option != 5);
-}
-
-void output_dequeue() {
-  int option, value;
-  Dequeue dq;
-
-  do {
-    cout<<"\n****** MENU ******\n"
-        <<"1. Insert right\n"
-        <<"2. Insert left\n"
-        <<"3. Delete left\n"
-        <<"4. Display\n"
-        <<"5. Exit to Main Menu\n";
-
-    cout<<"Enter your option: ";
-    cin>>option;
-
-    switch(option) {
-      case 1: cout<<"Enter the value to be inserted: ";
-              cin>>value;
 
-              dq.insert_right(value);
-              break;
-
-      case 2: cout<<"Enter the value to be inserted: ";
-              cin>>value;
-
-              dq.insert_left(value);
-              break;
-
-      case 3: dq.del_left();
-              break;
-
-      case 4: dq.display() ;
-              break;
+    struct node* parent = front;
+    while(1){
+        if(parent->link != NULL && parent->link == rear)
+            break;
+        else if(parent == rear)
+            break;
+        parent = parent->link;
+    }
 
-      case 5: break;
+    if(parent == rear){
+        front = rear = NULL;
+    }
+    else if(parent->link  == rear){
+        parent->link =  NULL;
 
-      default: cout<<"Wrong option !\n";
-               break;
+        // I forgot to update the rear pointer here and that causes
+        // problems
+        
+        rear = parent;
     }
-  } while(option != 5);
 }
 
-int main() {
-  int option, value;
-  Dequeue dq;
-
-  do {
-    cout<<"\n******* MAIN MENU *******\n"
-        <<"1. Input Restricted Dequeue\n"
-        <<"2. Output Restricted Dequeue\n"
-        <<"3. Exit\n";
 
-    cout<<"Enter your option: ";
-    cin>>option;
-
-    switch(option) {
-      case 1: input_dequeue();
-              break;
-
-      case 2: output_dequeue();
-              break;
-
-      case 3: break;
-
-      default: cout<<"Wrong option !\n";
-               break;
+void print_queue(struct node* front1, struct node* rear1){
+    
+    if(front == NULL && rear == NULL){
+        cout << "Queue doesn't exist";
+        return;
+    }
+    struct node* ptr = front;
+    while(ptr != NULL){
+        cout  << ptr->data << " ";
+        ptr = ptr->link;
     }
-  } while(option != 3);
 
-  if(option == 3) {
-    cout<< "\nTHANK YOU for using the program !\n"
-        <<"Have a good day.\n\n";
-  }
 }
+
+int main(){
+
+
+    struct node* front =  NULL;
+    struct node* rear = NULL;
+    cout << "1. Enter element at end\n";
+    cout << "2. Enter element in start\n";
+    cout << "3. Delete element from start\n";
+    cout << "4. Delete element from end\n";
+
+    int choice;
+    cin >> choice;
+    cin.ignore();
+    int item;
+    do{
+        switch (choice)
+        {
+        case 1:
+            cout << "Enter item: ";
+            cin >> item;
+            cin.ignore();
+            insert_right(front, rear, item);
+            cout << "Printing\n";
+            print_queue(front, rear);
+            break;
+        case 2:
+            cout << "Enter item: ";
+            cin >> item;
+            cin.ignore();
+            insert_beg(front, rear, item);
+            print_queue(front, rear);
+            break;
+
+        case 3: 
+            delete_front(front, rear);
+            print_queue(front, rear);
+            break;
+        case 4:
+            delete_rear(front, rear);
+            print_queue(front, rear);
+        default:
+            break;
+        }
+
+        cout << "\nEnter choice: ";
+        cin >> choice;
+        cin.ignore();
+    }while(choice != -1);
+}
\ No newline at end of file
diff --git a/stack.cpp b/stack.cpp
index 30616f9..09ce4dc 100644
--- a/stack.cpp
+++ b/stack.cpp
@@ -19,144 +19,65 @@
 // THE SOFTWARE.
 
 #include <iostream>
-using namespace std;
-
-// Defining the maximum size of the stack to be 10
-#define MAX 10
-
-// Defining a class to store the member variables
-// and member functions required
-class Stack {
-  int stk[MAX], top;
-
-public:
-  Stack(): top(-1) {}
-  void push(int );
-  int pop();
-  void display();
-};
-
-
-/*
-
-ALGORITHM FOR PUSHING AN ELEMENT IN THE STACK:
-
-  1) IF TOP = MAX-1
-        WRITE Overflow
-        EXIT
-
-  2) TOP = TOP + 1
-  3) STACK[TOP] = VALUE
-  4) EXIT
-
-*/
-
-void Stack :: push(int value) {
-  // When the size of stack has reached maximum,
-  // we cannot insert any element
-  if(top == MAX-1) {
-    cout<<"The Stack is full !\n";
-  }
-  else {
-    // Incrementing top
-    top++;
-
-    // Store the value in the stack at top position
-    stk[top] = value;
-  }
+using namespace std; 
+int stack[100], n=100, top=-1;
+void push(int val) {
+   if(top>=n-1)
+      cout<<"Stack Overflow"<<endl; 
+   else {
+      top++;
+      stack[top]=val;
+   }
 }
-
-
-/*
-
-ALGORITHM FOR POPPING AN ELEMENT FROM THE STACK:
-
-  1) IF TOP = -1
-        WRITE Underflow
-        RETURN -1
-        EXIT
-
-  2) VALUE = STK[TOP]
-  3) TOP = TOP - 1
-  4) RETURN VALUE
-  5) EXIT
-
-*/
-
-int Stack :: pop() {
-  // When the size of stack is -1, the stack is empty
-  if(top == -1) {
-    cout<<"The Stack is empty !\n";
-    return -1;
-  }
-  else {
-    // Store the top value
-    int value = stk[top];
-
-    // Decrement top
-    top --;
-
-    return value;
-  }
+void pop() {
+   if(top<=-1)
+      cout<<"Stack Underflow"<<endl;
+   else {
+      cout<<"The popped element is "<< stack[top] <<endl;
+      top--;
+   }
 }
-
-
-// Display the elements of the Stack by decrementing starting from top
-void Stack :: display() {
-  // When the size of stack is -1, the stack is empty
-  if(top == -1) {
-    cout<<"The Stack is empty !\n";
-  }
-  else {
-    // Decrementing stack starting from top position
-    for(int i=top; i>=0; i--) {
-      // Printing each stack element
-      cout<<stk[i]<<" ";
-    } cout<<endl;
-  }
+void display() {
+   if(top>=0) {
+      cout<<"Stack elements are:";
+      for(int i=top; i>=0; i--)
+         cout<<stack[i]<<" ";
+         cout<<endl;
+   } else
+      cout<<"Stack is empty";
 }
-
-
-// Main Function
 int main() {
-  int option, value;
-  Stack s;
-
-  do {
-    cout<<"\n**** MENU ****\n"
-        <<"1. Push\n"
-        <<"2. Pop\n"
-        <<"3. Display\n"
-        <<"4. Exit\n";
-
-    cout<<"Enter your option: ";
-    cin>>option;
-
-    switch(option) {
-      case 1: cout<<"Enter the value to be pushed: ";
-              cin>>value;
-
-              s.push(value);
-              break;
-
-      case 2: value = s.pop();
-              if(value != -1) {
-                cout<<"The popped element is: "<<value<<endl;
-              }
-              break;
-
-      case 3: s.display();
-              break;
-
-      case 4: break;
-
-      default: cout<<"Wrong option !\n";
-               break;
-    }
-  } while(option != 4);
-
-  if(option == 4) {
-    cout<< "\nTHANK YOU for using the program !\n"
-        <<"Have a good day.\n\n";
-  }
-}
+   int ch, val; 
+   cout<<"1) Push in stack"<<endl;
+   cout<<"2) Pop from stack"<<endl;
+   cout<<"3) Display stack"<<endl;
+   cout<<"4) Exit"<<endl;
+   do {
+      cout<<"Enter choice: "<<endl;
+      cin>>ch;
+      switch(ch) {
+         case 1: {   
+            cout<<"Enter value to be pushed:"<<endl;
+            cin>>val;
+            push(val);
+            break;
+         }
+         case 2: {
+            pop();
+            break;
+         }
+         case 3: {
+            display();
+            break;
+         }
+         case 4: {
+            cout<<"Exit"<<endl;
+            break;
+         }
+         default: {
+            cout<<"Invalid Choice"<<endl;
+         }
+      }
+   }while(ch!=4); 
+      return 0;
+}
\ No newline at end of file