Improved sabering
