WIP --- more recent changes