2nd commit with fixes