latest changes, will tweak tomorrow