Change points to karma
Update to use map