005 better - needs cleanup