3rd commit with fixes