added xray preset and refactored a bit