Work on Energy & tables