[Issue #74][Updating] changed method to match new conventions