commit 1.2 by Sadupa