Added additional infos
Bug fixes
Imported new version
Deleted old version
Refactor for passive view
Code refactor for passive view