updated init and definitions ready to go live