issues 308,313,317,320 are done