merge with previous lost version with calculator