Updated a lot. Still testing needed