updated for extra data and notebook files