removed seemingly unhelpful _ on some properties, didnt test run