small structural changes [unfinished]