more changes for framework