updated with stuff