update 5164.21982

3/5 features implemeted