more updates even though they won't merge :(