add damianos suggestions
add damianos suggestions