Update interface
Separate Array
Separate Matrix from main file