Second commit with corrections