updated with answers