#32 #34 #35 #35 All issues resolved