Refractor code.
Refractor code.
refactor code. not working yet.