added Janniks stuff no2