final changes for initial version