changes fom AM (calc fix and so on)