added stuff for joakim