changing code, more adding