Minor changes
New code