added suggestions by Daniel