Updated and tested ports