Changed a bit the scheme