closes #44: updated for all implemented methods