edited a little, not much done