(Freestyle) #49 apply proposal

@gossi please check that I did this correct. The proposal was a little
confusing.