Got it work, need to improve