Development level improvements... vol.2