added more assemly methids, refactored helpers