cleaned up firing of methods. needs testing with joe