fixed for first part too