Testing added
Logic is completed