Added partial 'x' functionality