Added work done by Olof