fix this up so that it works properly