Changed some param names, changed method signature