improve leon, crazy.....