Remove boilerplate, add more transfers