Many changes to both old and new methods