doing some more stuff for feature C