I will re-do this section soon..