added fwk things