Making it more portable