Update curr
and next
to pick up cost type ChaCha
#304
Merged
curr
and next
to pick up cost type ChaCha
#304