bug fis. v1.1 for production
resolve merge conflict
added notex, completed coding