finalized part 2... at least for now