Platform Code Changes! working on preventing fall through