Modified to support onelining everything...