Re-Arranged stuff a bit...