Added new elements. Cleanup. Needs update