Updated WIP.