fix.. & simplify