commit damian's changes
sync damian's changes