simplified by taking out galleries