finally fix the refactor...doh stupid