added last new feature ready to merge