Internal Framework Rewrite-MIGHT CONTAIN BUGS