update based on agalante feedback