included external libaries, fixed imports