Further refine initial commit