not working methods deleted
Main methods added