added jan's and xoana's contribution