Quick Fix and Update :)