1.04 + some tweaks