Code Change & Quick Fix for Tiny Bugs
TMP-ISSUE