#157 Adaptation of the form