Further work on portfolio etc..