updated with new additions