@dionix: is it ok now