made method signatures consistent