fixed the above two