tiny tweaks - BIG CHANGES