changing related items to be more flexable