Added calculation of chaljo