commit andreeapz 3