refine
fix hard coding