reorganizing a little more. Becomes good !