Second commit v 1.1