#3184 methods written. ready to test
#3184 small fix
#3184 fixes after tests