Some more changes. Ready to show Mostafa