moved and improved the x