@mpetrovic Can you make the change that @amitaibu suggests, easier to read as well.