Modified and testing once again....