Second commit more changes