Second commit with fixes