changed fun. will probably change fun again.