fixed interfaces to be more consistant