Ongoing changes. Fixed part of cmd line prev submission