more changes for prototype