Second commit with few more changes