Reworked some parts.