Refined some things