rewrite it so it works