Some more updates…still not done