updated for harmony