Implemented partially with bugs - Adding due feature