updated  the scenner and added parser