commit 1.4 by sadupa