Final changes for non-static version