Solutions to LIA and new PROB; Some refactoring