updated with ann's changes