upgraded version and using built in tweaks