simplefy the code ...