Initial commit with all the updates