Rejig of code.