removed parameters; updated methods