changed constructor params