SOme interesting updates

Elaborate later, test now