First update aka. everything added