more changes for initial version