final tweaks
gold version