Reworked some details.