Initial commit with small changes