More code progression for issues #69 #70 #71