Making things a bit more friendly to run