Reverted back to c# 5 for now