Second commit (new updates)