solution 0307 with addon