Some method overridden
Changes from master have been merged.