final changes for first user test
merging