Important modification to get it more portable