More work on Dragon Scale. Now with less memory leaking