fix for release 1
resolve merge conflicts
completed coding