Made everything more portable