ADDED EMMANUEL

still some issues to fix, mitch  has list