Some tweaks for better flow