major changes
added navars