Oversimplification & some fixes