added all da shit