laser system refactored