Second commit small changes