Adding features back into portable