a few stuff changed and added