Added x as arbitrary value
Refactoring