fixed the first part