added bunch o stuff