completting codes #5
adding codes & fixing
add params