Steven

added methods, moved parameters