another update, finished ramira's version1