Testing some modifications