added points and all that things