First commit with updates