Added final tweaks