updated file to inlcude all the methods