merge from maria
add missed methods