updated 2 and added 4 from github