2nd commit with some updates