commit 1.3 by sadupa