Removed test, updated main script.