continue on updating UI and refactored codes