changed few methods