questions updated accordingly
pre clean up push