more changes to methods