added type and such