updated method/tests