confusion, merge latest changes