added preservation of forms