modify method names to give consitancy