adding Damianos suggestions