starting 2.0
New coding stadards
resolve conflicts