major updates 2

second of major updates