up to date
done with Needs model
fixed some merge conflicts
clean merge conflicts