resolved naming conflicts and added the last few methods