Rryan features effects

bring up to date with trunk