updated version
updated to include further parameters