Don't be so hacky