Improving this shit.