add/remove cals
NPE