commit 1.5 by sadupa