I forgot the @jlee-r7 feedback, reviewing! thanks @jlee-r7 for giving a chance to the pr! I'm not ignoring your feedback haha just too many github notifications hehe :)