some more writing, rearangement