Removed dependency on X