Tested and debugged ports changes