incorporated Amanda's changes