Added a lotta things