Second commit. Some more changes