finished methods
conflicts resolved with Denman present