Refined more stuff