a little more orginized