Make this more portable