#4 some litle reordering