Moved some functions back to forgery