Some Re-design stuffs