First commit with all changes