few tweaks for final task