Update after first implementation