Updates, reworking parts