first cal now working well